Merge branch 'xwscroll' into xwidget
authorJoakim Verona <joakim@verona.se>
Mon, 19 Jan 2015 23:50:50 +0000 (00:50 +0100)
committerJoakim Verona <joakim@verona.se>
Mon, 19 Jan 2015 23:50:50 +0000 (00:50 +0100)

Trivial merge